build with GTK_DISABLE_DEPRECATED again.

2008-08-04  Michael Natterer  <mitch@imendio.com>

	* gtk/Makefile.am: build with GTK_DISABLE_DEPRECATED again.

	Fix pltcheck.sh by restricting the visibility of deprecated
	symbols to the places where they are actually used:

	* gtk/gtkclist.c
	* gtk/gtkctree.c
	* gtk/gtklistitem.c
	* gtk/gtklist.c
	* gtk/gtkprogressbar.c
	* gtk/gtkpixmap.c
	* gtk/gtkprogress.c: #undef GTK_DISABLE_DEPRECATED and #define
	__GTK_FOO_C__ on top instead of before including gtkaliasdef.c.

	* gtk/gtkclist.h
	* gtk/gtkctree.h
	* gtk/gtklistitem.h
	* gtk/gtklist.h
	* gtk/gtkpixmap.h
	* gtk/gtkprogress.h: make the headers visible if the respective
	__GTK_FOO_C__ are defined.

svn path=/trunk/; revision=20970

diff --git a/ChangeLog b/ChangeLog
index e92d382b2668d8c09f490e227c4808c9457984d7..5b674c2459ef710738a8a11535b6168a403556ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2008-08-04  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/Makefile.am: build with GTK_DISABLE_DEPRECATED again.
+
+       Fix pltcheck.sh by restricting the visibility of deprecated
+       symbols to the places where they are actually used:
+
+       * gtk/gtkclist.c
+       * gtk/gtkctree.c
+       * gtk/gtklistitem.c
+       * gtk/gtklist.c
+       * gtk/gtkprogressbar.c
+       * gtk/gtkpixmap.c
+       * gtk/gtkprogress.c: #undef GTK_DISABLE_DEPRECATED and #define
+       __GTK_FOO_C__ on top instead of before including gtkaliasdef.c.
+
+       * gtk/gtkclist.h
+       * gtk/gtkctree.h
+       * gtk/gtklistitem.h
+       * gtk/gtklist.h
+       * gtk/gtkpixmap.h
+       * gtk/gtkprogress.h: make the headers visible if the respective
+       __GTK_FOO_C__ are defined.
+
 2008-08-04  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkclist.c

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 96380f121bd399c84607af2e91c9e8f8a7031119..2cacd54907268a2dc7142ebe8cab55c72199cd63 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -35,6 +35,7 @@ INCLUDES =                                            \
        -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \
        -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
        -DGDK_DISABLE_DEPRECATED                        \
+       -DGTK_DISABLE_DEPRECATED                        \
        -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED            \
        -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED          \
        $(GTK_DEBUG_FLAGS)                              \

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 2517409ed098d6bad58527b596b00a801e31c3c6..35d9eb31a0bc270eae8bff67348e1756017950fa 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -31,6 +31,8 @@
 #include <string.h>
 
 #undef GDK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#define __GTK_CLIST_C__
 
 #include <gdk/gdkkeysyms.h>
 
@@ -7790,6 +7792,4 @@ gtk_clist_set_button_actions (GtkCList *clist,
     }
 }
 
-#define __GTK_CLIST_C__
 #include "gtkaliasdef.c"
-

diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h
index 40a594d061b7b1b05af8c0afc5111ff1296d201c..6e40eb2491547b4f9af950a24a2afedb9e2b429b 100644 (file)
--- a/gtk/gtkclist.h
+++ b/gtk/gtkclist.h
@@ -25,7 +25,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef GTK_DISABLE_DEPRECATED
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_CLIST_C__) || defined (__GTK_CTREE_C__)
 
 #ifndef __GTK_CLIST_H__
 #define __GTK_CLIST_H__

diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index f95b3db0f26f4788cd1cfe85794d1019aeb5fdbc..f514bc6880f0d06bc79ee6796c33682873e63198 100644 (file)
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -28,10 +28,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#undef GDK_DISABLE_DEPRECATED
-
 #include "config.h"
 #include <stdlib.h>
+
+#undef GDK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#define __GTK_CTREE_C__
+
 #include "gtkctree.h"
 #include "gtkbindings.h"
 #include "gtkmain.h"
@@ -6098,5 +6101,4 @@ gtk_ctree_node_get_type (void)
   return our_type;
 }
 
-#define __GTK_CTREE_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtkctree.h b/gtk/gtkctree.h
index 4e1551198aec35951608536b95462e7e0923c31f..1cf55236cccd122cd933c6f77344ade7edcdda57 100644 (file)
--- a/gtk/gtkctree.h
+++ b/gtk/gtkctree.h
@@ -28,7 +28,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef GTK_DISABLE_DEPRECATED
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_CLIST_C__) || defined (__GTK_CTREE_C__)
 
 #ifndef __GTK_CTREE_H__
 #define __GTK_CTREE_H__

diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index be651e951bfb1c4798dad5413bef4985c6cc27f8..161a2c14746aaee14a11164fad3b76dbafcbff62 100644 (file)
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -27,6 +27,9 @@
 #include "config.h"
 #include <string.h> /* memset */
 
+#undef GTK_DISABLE_DEPRECATED
+#define __GTK_LIST_C__
+
 #include "gtklist.h"
 #include "gtklistitem.h"
 #include "gtkmain.h"
@@ -2575,5 +2578,4 @@ gtk_list_drag_begin (GtkWidget      *widget,
     }
 }
 
-#define __GTK_LIST_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtklist.h b/gtk/gtklist.h
index 08154859bb31252c727b88dd3071bb5e1022fe02..873989e6255e70159d73943a4694680dfec7cd1d 100644 (file)
--- a/gtk/gtklist.h
+++ b/gtk/gtklist.h
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef GTK_DISABLE_DEPRECATED
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_LIST_C__)
 
 #ifndef __GTK_LIST_H__
 #define __GTK_LIST_H__

diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c
index 370c746ca09a034226b26df6fa015c903f6a7d4b..6db5e7f6616f46589c9d4adf674e373bd00ff5ef 100644 (file)
--- a/gtk/gtklistitem.c
+++ b/gtk/gtklistitem.c
@@ -28,6 +28,9 @@
 
 #include <gdk/gdkkeysyms.h>
 
+#undef GTK_DISABLE_DEPRECATED
+#define __GTK_LIST_ITEM_C__
+
 #include "gtkbindings.h"
 #include "gtklabel.h"
 #include "gtklistitem.h"
@@ -624,5 +627,4 @@ gtk_real_list_item_toggle (GtkItem *item)
     }
 }
 
-#define __GTK_LIST_ITEM_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtklistitem.h b/gtk/gtklistitem.h
index 545765d047e1e73db3769a8b3cf6bcde1de415a2..f2955a40b97ea77ec4dcb595f1326c077bdfb151 100644 (file)
--- a/gtk/gtklistitem.h
+++ b/gtk/gtklistitem.h
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef GTK_DISABLE_DEPRECATED
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_LIST_ITEM_C__)
 
 #ifndef __GTK_LIST_ITEM_H__
 #define __GTK_LIST_ITEM_H__

diff --git a/gtk/gtkpixmap.c b/gtk/gtkpixmap.c
index d088c410715cd1bc44d47c7792d1da219e8ac41f..dc902fd1d3e76fa15683a4cb9f3f422fa36b40f2 100644 (file)
--- a/gtk/gtkpixmap.c
+++ b/gtk/gtkpixmap.c
@@ -27,10 +27,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#undef GDK_DISABLE_DEPRECATED
-
 #include "config.h"
 #include <math.h>
+
+#undef GDK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#define __GTK_PIXMAP_C__
+
 #include "gtkcontainer.h"
 #include "gtkpixmap.h"
 #include "gtkintl.h"
@@ -277,5 +280,4 @@ build_insensitive_pixmap (GtkPixmap *gtkpixmap)
   g_object_unref (G_OBJECT (stated));
 }
 
-#define __GTK_PIXMAP_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtkpixmap.h b/gtk/gtkpixmap.h
index 747a04d9574b27363b7f3ea5e6433a047613c75d..bfad050e89366091700925b14e3da3180ce26a4c 100644 (file)
--- a/gtk/gtkpixmap.h
+++ b/gtk/gtkpixmap.h
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef GTK_DISABLE_DEPRECATED
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_PIXMAP_C__)
 
 #ifndef __GTK_PIXMAP_H__
 #define __GTK_PIXMAP_H__

diff --git a/gtk/gtkprogress.c b/gtk/gtkprogress.c
index 7e528adb9c331e237ab84f1c8c4c1ca0a0851f8c..3a1ac52c97e517c5fc03a062e8282e8c005fff32 100644 (file)
--- a/gtk/gtkprogress.c
+++ b/gtk/gtkprogress.c
@@ -27,7 +27,10 @@
 #include "config.h"
 #include <math.h>
 #include <string.h>
+
 #undef GTK_DISABLE_DEPRECATED
+#define __GTK_PROGRESS_C__
+
 #include "gtkprogress.h" 
 #include "gtkprivate.h" 
 #include "gtkintl.h"
@@ -707,5 +710,4 @@ gtk_progress_set_activity_mode (GtkProgress *progress,
     }
 }
 
-#define __GTK_PROGRESS_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtkprogress.h b/gtk/gtkprogress.h
index fbd86387fc8689c21265974855e38a3ed5cabe6e..b47e8760f1a65e426ba1242f28adcd9b1549354d 100644 (file)
--- a/gtk/gtkprogress.h
+++ b/gtk/gtkprogress.h
@@ -35,7 +35,7 @@
 
 G_BEGIN_DECLS
 
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_PROGRESS_C__) || defined (__GTK_PROGRESS_BAR_C__)
 
 #define GTK_TYPE_PROGRESS            (gtk_progress_get_type ())
 #define GTK_PROGRESS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PROGRESS, GtkProgress))
@@ -44,7 +44,7 @@ G_BEGIN_DECLS
 #define GTK_IS_PROGRESS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PROGRESS))
 #define GTK_PROGRESS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PROGRESS, GtkProgressClass))
 
-#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
+#endif /* !GTK_DISABLE_DEPRECATED */
 
 typedef struct _GtkProgress       GtkProgress;
 typedef struct _GtkProgressClass  GtkProgressClass;
@@ -84,7 +84,7 @@ struct _GtkProgressClass
  * directly.
  */
 
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (__GTK_PROGRESS_C__) || defined (__GTK_PROGRESS_BAR_C__)
 
 GType      gtk_progress_get_type            (void) G_GNUC_CONST;
 void       gtk_progress_set_show_text       (GtkProgress   *progress,
@@ -114,7 +114,7 @@ gdouble    gtk_progress_get_current_percentage (GtkProgress *progress);
 gdouble    gtk_progress_get_percentage_from_value (GtkProgress *progress,
                                                   gdouble      value);
 
-#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
+#endif /* !GTK_DISABLE_DEPRECATED */
 
 G_END_DECLS
 

diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index bf690f2f36c35fdfc0cca1558af1cd95c19de54d..96b316748a53f31603770acf0734cf121a5befe0 100644 (file)
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -28,6 +28,9 @@
 
 #include <string.h>
 
+#undef GTK_DISABLE_DEPRECATED
+#define __GTK_PROGRESS_BAR_C__
+
 #include "gtkprogressbar.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
@@ -1378,5 +1381,4 @@ gtk_progress_bar_get_ellipsize (GtkProgressBar *pbar)
   return pbar->ellipsize;
 }
 
-#define __GTK_PROGRESS_BAR_C__
 #include "gtkaliasdef.c"